From a872a9ab5e57bb386bffa97af0bccb75b9d3cf8e Mon Sep 17 00:00:00 2001 From: "cw@f00f.org[kaf24]" Date: Wed, 20 Apr 2005 10:36:34 +0000 Subject: [PATCH] bitkeeper revision 1.1337 (426630b2jBKjnL7WBIWHGPtgL50rqg) [PATCH] [PATCH] gdbserver minor build fixes gdb-6.2.1-xen-sparse/gdb/gdbserver/configure | 2 +- gdb-6.2.1-xen-sparse/gdb/gdbserver/configure.in | 2 +- gdbbuild | 16 ++++++++++++---- 3 files changed, 14 insertions(+), 6 deletions(-) More cleanups are possible, I'll send those at a later stage. --- BitKeeper/etc/logging_ok | 1 + .../gdb-6.2.1-xen-sparse/gdb/gdbserver/configure | 2 +- .../gdb/gdbserver/configure.in | 2 +- tools/gdb/gdbbuild | 16 ++++++++++++---- 4 files changed, 15 insertions(+), 6 deletions(-) diff --git a/BitKeeper/etc/logging_ok b/BitKeeper/etc/logging_ok index 891ae8d98e..943f7d9fbd 100644 --- a/BitKeeper/etc/logging_ok +++ b/BitKeeper/etc/logging_ok @@ -20,6 +20,7 @@ cl349@arcadians.cl.cam.ac.uk cl349@firebug.cl.cam.ac.uk cl349@freefall.cl.cam.ac.uk cl349@labyrinth.cl.cam.ac.uk +cw@f00f.org cwc22@centipede.cl.cam.ac.uk cwc22@donkeykong.cl.cam.ac.uk djm@djmnc4000.(none) diff --git a/tools/gdb/gdb-6.2.1-xen-sparse/gdb/gdbserver/configure b/tools/gdb/gdb-6.2.1-xen-sparse/gdb/gdbserver/configure index 85011cead0..e81046517a 100755 --- a/tools/gdb/gdb-6.2.1-xen-sparse/gdb/gdbserver/configure +++ b/tools/gdb/gdb-6.2.1-xen-sparse/gdb/gdbserver/configure @@ -3475,7 +3475,7 @@ USE_THREAD_DB= GDBSERVER_DEPFILES="$srv_regobj $srv_tgtobj $srv_thread_depfiles" -GDBSERVER_LIBS="$srv_libs -lxc" +GDBSERVER_LIBS="$srv_libs -L../../../../libxc/ -L../../../../libxutil/ -lxc -lxutil" diff --git a/tools/gdb/gdb-6.2.1-xen-sparse/gdb/gdbserver/configure.in b/tools/gdb/gdb-6.2.1-xen-sparse/gdb/gdbserver/configure.in index 94b281582f..032eabe345 100644 --- a/tools/gdb/gdb-6.2.1-xen-sparse/gdb/gdbserver/configure.in +++ b/tools/gdb/gdb-6.2.1-xen-sparse/gdb/gdbserver/configure.in @@ -107,7 +107,7 @@ USE_THREAD_DB= GDBSERVER_DEPFILES="$srv_regobj $srv_tgtobj $srv_thread_depfiles" -GDBSERVER_LIBS="$srv_libs -lxc" +GDBSERVER_LIBS="$srv_libs -L../../../../libxc/ -L../../../../libxutil/ -lxc -lxutil" AC_SUBST(GDBSERVER_DEPFILES) AC_SUBST(GDBSERVER_LIBS) diff --git a/tools/gdb/gdbbuild b/tools/gdb/gdbbuild index 29efd6bf9e..2a52870849 100755 --- a/tools/gdb/gdbbuild +++ b/tools/gdb/gdbbuild @@ -1,9 +1,12 @@ -#!/bin/csh -f -setenv XENROOT `bk root` +#!/bin/sh + +XENROOT=`bk root` +export XENROOT cd $XENROOT/tools/gdb rm -rf gdb-6.2.1 gdb-6.2.1-linux-i386-xen -wget ftp://ftp.gnu.org/gnu/gdb/gdb-6.2.1.tar.bz2 +# FIXME:cw this should be smarter +wget -c ftp://ftp.gnu.org/gnu/gdb/gdb-6.2.1.tar.bz2 tar xjf gdb-6.2.1.tar.bz2 cd $XENROOT/tools/gdb/gdb-6.2.1-xen-sparse @@ -12,4 +15,9 @@ cd $XENROOT/tools/gdb/gdb-6.2.1-xen-sparse mkdir $XENROOT/tools/gdb/gdb-6.2.1-linux-i386-xen cd $XENROOT/tools/gdb/gdb-6.2.1-linux-i386-xen ../gdb-6.2.1/configure -gmake -j4 +# some people don't have gmake +if which gmake ; then + gmake -j4 +else + make -j4 +fi -- 2.30.2